# HG changeset patch # User Joerg Sonnenberger # Date 1719756170 -7200 # Node ID 34eb3a711955466adac0f74213b0e8e20373b378 # Parent 20869811712425ad051f53c75d30e8c984862550 http: simplify diff -r 208698117124 -r 34eb3a711955 mercurial/keepalive.py --- a/mercurial/keepalive.py Sun Jun 30 14:16:43 2024 +0200 +++ b/mercurial/keepalive.py Sun Jun 30 16:02:50 2024 +0200 @@ -380,8 +380,8 @@ class HTTPResponse(httplib.HTTPResponse): # we need to subclass HTTPResponse in order to - # 1) add close_connection() methods - # 2) add info() and geturl() methods + # 1) add close_connection() method + # 2) add geturl() method # 3) add accounting for read(), readlines() and readinto() def __init__(self, sock, debuglevel=0, strict=0, method=None): @@ -419,49 +419,34 @@ self._handler._remove_connection(self._host, self._connection, close=1) self.close() - def info(self): - return self.headers - def geturl(self): return self._url def read(self, amt=None): data = super().read(amt) self.receivedbytescount += len(data) - try: + if self._connection is not None: self._connection.receivedbytescount += len(data) - except AttributeError: - pass - try: + if self._handler is not None: self._handler.parent.receivedbytescount += len(data) - except AttributeError: - pass return data def readline(self): data = super().readline() self.receivedbytescount += len(data) - try: + if self._connection is not None: self._connection.receivedbytescount += len(data) - except AttributeError: - pass - try: + if self._handler is not None: self._handler.parent.receivedbytescount += len(data) - except AttributeError: - pass return data def readinto(self, dest): got = super().readinto(dest) self.receivedbytescount += got - try: + if self._connection is not None: self._connection.receivedbytescount += got - except AttributeError: - pass - try: + if self._handler is not None: self._handler.parent.receivedbytescount += got - except AttributeError: - pass return got